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