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