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