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