Merge changes I2c79865b,Idfe8093c am: 8be4b590cf am: 53da7727b4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ae6d901ec73596b022b43d09824232b4ef7f8c8