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