Merge changes from topic "presubmit-am-3f78062f120d41f7890be93b4030422a" into sc-v2-dev-plus-aosp am: a4c4e15290

Original change: https://googleplex-android-review.googlesource.com/c/device/google/barbet/+/17607944

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