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

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

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



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