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