Merge "AVRCP: Add lock in JNI to fix race conditions" into bt.lnx.5.0