[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: bd6df21f -s ours am: ef46aa1f -s ours am: 66a20a72 -s ours am: a0be2876 -s ours

am skip reason: subject contains skip directive

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



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