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