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

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

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