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

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

Change-Id: I6e80eb6917a16e3df331e7fc1923ca6e15e04a7f