[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 9d994cd0 -s ours am: efd1c33a -s ours am: 2d73d592 -s ours am: ac29a99c -s ours am: d12fcd63 -s ours

am skip reason: subject contains skip directive

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



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