Merge "StorageManagerService: rename mLocalUnlockedUsers to mCeUnlockedUsers" into main