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