[automerger skipped] Merge "Merge SP2A.220505.002" am: c01930f7 -s ours am: 56c9d9b5 -s ours

am skip reason: Merged-In I5a35451e14cba5f115ab66926d62c4fa4556a267 with SHA-1 8f360231 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2086423



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