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