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

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

Change-Id: I95dc35f00d164bfb4d0d1d0049c3299772b480b7