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