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