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