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