Merge changes Ic1b9dae6,I470d5931,Ic6756e28,Iba526237,I8e8be258 am: 81dcde82a8

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

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