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