[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 8d76739a53 -s ours am: 67fcb65189 -s ours am: 077d6c34ac -s ours

am skip reason: subject contains skip directive

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

Change-Id: I80cde2b433d018b3e43496c6a1ccb5b1f3072d5b