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