[automerger skipped] Merge Android R am: ab4e1884a5 -s ours am: f370fae9a3 -s ours

am skip reason: Change-Id I6a8acb690e153838070951963797f69d92e58c1e with SHA-1 372dcf5177 is in history

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

Change-Id: I85b84cb8f0e0033d2e972eb2bcc0b7ecc0724966