[automerger skipped] Merge changes I6ec56c68,Idc44d73f,I9cd3e442,Iae490f19,I44dd28b0, ... am: 652cf9c564 am: 42d74627dc am: 9db4293d9e -s ours

am skip reason: Merged-In I6ec56c68df5e1049d93c31e498934501f7d75ad1 with SHA-1 778ddca75a is already in history

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

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