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