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