Taken from branch udc-gsi-release.

Bug: 299863516
Test: na
Change-Id: I4551229bc295f720951013469cd9759f40a31ac7

am skip reason: Merged-In I6f2adc199e9f511b63231ce1ff9558375234712a with SHA-1 f73fc368 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/vndk/v34/+/24183017



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

Bug: 291102124
Merged-In: I6f2adc199e9f511b63231ce1ff9558375234712a
Change-Id: I1eb3541dcd70143e67b243f3b2b0c5908420f11b

Taken from branch udc-gsi-release.

Bug: 288189000
Test: na
Change-Id: I6f2adc199e9f511b63231ce1ff9558375234712a

Taken from branch udc-gsi-release.

Bug: 284051739
Test: na
Change-Id: If9534386b638a8e5672c7c57fefd377002570921

Taken from branch udc-gsi-release.
This is part 2 of 2.

Bug: 270625053
Test: na
Change-Id: I2aaa5a91653eb31c5066806e3582692ff0c9e1cc

Taken from branch udc-gsi-release.
This is part 1 of 2.

Bug: 270625053
Test: na
Change-Id: Ia06c1abb757061020ca00e9be70040910addfa22