Merge changes I6ec56c68,Idc44d73f,I9cd3e442,Iae490f19,I44dd28b0, ... am: 652cf9c564

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

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