Merge "Log more info on StorageManagerService.unlockUserKey()" into rvc-dev...
Merge "Log more info on StorageManagerService.unlockUserKey()" into rvc-dev am: 159904ef am: 370d4943 am: f4b2a3bc am: aa0fcff1
Change-Id: Id86f53679b5b94b2cdf9006e69e61102ed685268