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