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