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