[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 48aa1cdd7f -s ours am: b6564565a3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7fa0598fd51e57ad3d42f45a2a1ddf5b855d638a