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

[automerger skipped] Merge "Merge SP2A.220505.002" am: c01930f7 -s ours am: 56c9d9b5 -s ours am: 83a61eae -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: I02a4b5f5062a40c432a47a8235eccfac724552a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>