[automerger skipped] Merge changes from topic "nullzero-hal-v7" am: 8d93e3a8...

[automerger skipped] Merge changes from topic "nullzero-hal-v7" am: 8d93e3a8 am: 06821f25 am: e6bb7c2a -s ours

am skip reason: Change-Id Ic9e2b986d3f9734dd884a2c88ca86d251147126b with SHA-1 58d9942a is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1507221

Change-Id: I33993b66f16dd2d00066989d769d7d033ae4622c