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