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