Merge changes from topic "nullzero-hal-v7" am: 8d93e3a8d3

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

Change-Id: I4ace30bfcb61da281c6d5f0f19df4e319a4639c8