Merge "Clean up unnecessary lock of WmTests" into rvc-dev am: 53ed707827

Change-Id: I8b8fdcf602a7b7eb092e5ee53238c537157f4c5f