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