Merge changes I8ae16870,Ic0eb09df am: 6a1a60e220 am: c519d81ac3 am: dd3ffacc36

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314f7aa243441e793eca9f2a139e161b38c648ee