[go: nahoru, domu]

Merge changes I478fc99b,I2150459b into main am: 740301ed52

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

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