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