Merge changes from topic "sp14-ipahal" am: d202400f63 am: 05daef03ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bc2df4f3cd08ef7678964e373b865fc619b262e