Merge "AIDL: Update locking in EffectImpl"