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