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 am: f2203636

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



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