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