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