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

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

Change-Id: Ic858c5fa862758e0de6b9db0d852944c2dbf77aa