Merge "Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd62480 am: 130cb923 am: b24828bd" into nyc-mr1-dev-plus-aosp