[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: skip tag Change-Id I435e34d50f469e0056eb23a71b1e8872f491e27f with SHA-1 1a8e6a75a4 is already in history

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

Change-Id: I1baf1af4af88644ac36e6b4529bd27d90fc50caa