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