[automerger skipped] Merge changes I2c79865b,Idfe8093c am: 8be4b590cf am: 53da7727b4 am: 0e242cb62b -s ours

am skip reason: Change-Id I2c79865bf666d3f4bf53061ff5090746403583e9 with SHA-1 afc4d7cfe7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcdcdeb2a52d2708e593ab6c4e1d3a13c8627704