DO NOT MERGE - Merge ab/7272582 am: eb04d6164c am: bd9720a0cb

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

Change-Id: Ibfdf676a1e9c7117384bfb6aec1901e4fbf0068e