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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f8f3f0a05aed1b899b159c6252d055c90699fc5