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