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