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