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