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

Change-Id: I3e49063651a8aec32fd6c3ca96b1e610aa62e036