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