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