Merge changes from topic "aidl_effect_lock" am: 6900a3c936

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

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