Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17802107 Change-Id: Iefd89ab4ac8f439915d6caf5ce87cae63571a671 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>