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