Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012
am: 130cb9232a

Change-Id: Ia3d8581e5641e2da8a5d84222edb81829edbc6d0