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