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