Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into...

Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11 am: 27d3d5cb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453



Change-Id: Id69fd6f3072a9d2daef15262ec5a168d57813cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>