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