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