Merge "Address ANAPIC review comments -- hal." am: 8b389e1123 am: 706652c817 am: cfa3838085 am: aba49d0512

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

Change-Id: I88834c87adc1958cfd6cc68929d38eaad43c2d93