Merge changes I88ee8d2f,Id15ecc7f into main am: c081fa39df am: 58445c733c am: 14a734402a am: ad3fec9545 am: 170ca7bb2f

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

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