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