Merge "Mock views in Keyguard view tests" into rvc-dev am: 2dc9632e am: 0953e8d3 am: c631fa10 am: 56d0a0dc Change-Id: I8f9fa337b40841867517f5f3ed4a9d5365886973