[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 48aa1cdd7f -s ours

am skip reason: Merged-In I99b4579d11ae816785ad60eaf5cdb40e3382ee0d with SHA-1 bd9720a0cb is already in history

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

Change-Id: I4ed1a0100787f63c766e5da1262e548c3a23f23d