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