Merge "Created typed class pin result in keyguard" am: d2b38018cc am: f289048875

Change-Id: I4744472b93a81c5636f9f2205e4b97ecf2e5733f