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