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

am skip reason: subject contains skip directive

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

Change-Id: I9166e95469f0281ac5d63539bf5c0d3560d2d593