Revert^2 "Remove final calls to Dependency.get from keyguard."

bfec35b4f4e7fc70cfa2c4c209c9edf3cacb7f95

Change-Id: I423b0aa056a5f6ad601874f4bff41299b35f0a7f
4 files changed