Merge changes I8ae16870,Ic0eb09df am: 6a1a60e220

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7c9ac50673cedf4c59f7251d38bbe4259d69cfc