[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: eb04d6164c am: bd9720a0cb am: f7983c1e31 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I400dfa6f98415ad79a34f9b462eab877724d6ca7