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