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