[automerger skipped] DO NOT MERGE - Merge Android 13 am: b0e5404933 -s ours am: 247769b8a2 -s ours am: 65dcd06e12 -s ours am: 5a7837c3c5 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2186564

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