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

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

Change-Id: I9f4c9427281659972ac607ee28afcc274e1691ac