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