[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 9d994cd0 -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: I5ac50a96e31ddf5c6429ff11b6be79ab687155c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>