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