[automerger skipped] Merge "Merge TQ2A.230405.003" am: f937bad9 am:...

[automerger skipped] Merge "Merge TQ2A.230405.003" am: f937bad9 am: 2c1da007 -s ours am: 9b8fbff2 -s ours

am skip reason: Merged-In I3bf5aecbfd717036a5b167696b107ee6cb1830b4 with SHA-1 f3d1e8c2 is already in history

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



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