[automerger skipped] DO NOT MERGE - Merge Android 13 am: a2ab7362c9 -s ours am: 864265912c -s ours am: be7e563ea4 -s ours am: ad1fd31adc -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/vndk/+/2186955

Change-Id: Idd11b3aa1324e5d8e320fed218ecc42cc475542a
Signed-off-by: Automerger Merge Worker <[email protected]>