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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72f0c999b54a1330c21b13e68c67b8517e32a369