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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I082e795678d38f9545e7aec50331c4dc0ce97eaf