Merge "Log more info on StorageManagerService.unlockUserKey()" into rvc-dev