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