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