[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 skip reason: Merged-In Ifba8d5912e2c39f2b403c829d44fa6d09468138d with SHA-1 9bb87d3f is already in history

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



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