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