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