[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 5ef5916839 -s ours am: 57e6121438 -s ours am: 2960b4995e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5e51b6afa0121c930b57d17b71f960d63b1cf14b