tree 28c1789494e2ae370dca8ff8c13faeb65c46bb4b
parent 043542d1fdaf71ae1a5184435acd2a61e1c3155a
parent d1bd493ce0a1f95eb6731d321bed1c74acf11656
author Shunkai Yao <yaoshunkai@google.com> 1670638704 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670638704 +0000

Merge changes from topic "aidl_effect_lock" am: 6900a3c936 am: d1bd493ce0

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

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