Merge changes I2c79865b,Idfe8093c am: 8be4b590cf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff929729f915c29e6eaa72c254766bc1b71faac4