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

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

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