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