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