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