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

Change-Id: Ic01c8c6ecf5c91e055fb05f6317d4d7ae71f1be6