Merge changes I0a18a6d9,I13a83113,I13c9c8d1,I8717acac am: 8fcc79fcb7 am: 688975c3d2 am: dc7598230f

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

Change-Id: I242d8514105b8d918e96c69cf7a71617d1998d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>