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