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