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