Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev