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