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