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