[automerger skipped] Merge Android R am: ab4e1884a5 -s ours am: f370fae9a3 -s ours am: 21fa6c12fd -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: Iff77668695d3df2e6f68433bbcac203895b7c9a3