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

am skip reason: skip tag Change-Id Ia3a9dae55e766ef339a0d16bd5163f592765221a with SHA-1 5ef5916839 is already in history

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

Change-Id: I9c5ca08032402059d04d3151d83dbc5b20e8aef0