[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: 0445442a6a -s ours am: af8c307c85 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0b84330b08f01d47945c7fe5a9db809a0eb0dad7