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