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