DO NOT MERGE - Merge ab/7272582 am: eb04d6164c

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

Change-Id: I99b4579d11ae816785ad60eaf5cdb40e3382ee0d