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

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

Change-Id: Idc8e6d5cb1ed7e287cdd9786dd93dc520d38a6ff