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