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