[go: nahoru, domu]

Merge changes I35f4860e,I4f02885b into main am: e2e4e54a0a

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

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