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

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

Change-Id: Ib5e845fe6c6792f97a486b86033eb8295175a50f