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