Merge "Fix an incorrect use of ScopedContentionRecorder in ReaderWriterMutex." am: c1e5889277 am: f01b21f01f
am: e03b0f0ef5

Change-Id: I3a4c82a758bd0f203a6677b712e620db673f9aa7