Merge "Fix MonitorContendedEntered test."
am: 91a2252422

Change-Id: I83f5847a3e8cc25eede68ad80a8f51049e8ba85c