[automerger skipped] Merge SP2A.220505.002 am: a08bbceb -s ours am: 490ab884 -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: Ie26765b9408c9875c141e7a00ca75f58d291820d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>