Merge changes I580e3f1d,I8e271982 am: 8ec315a25e am: 0e9d7c64a4 am: 0386c840d6

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

Change-Id: I52d8ee406e7aff65092cd4d23320c77ec4b822e6