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