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

Change-Id: I4bb75cd67d9b937176434e0c192616b090c83738