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