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