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