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