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