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

Change-Id: Ie1d930f8925431641932bf1c4c94df9e57ffefc5