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