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