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