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