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