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