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