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>