Merge "Mock views in Keyguard view tests" into rvc-dev am: 2dc9632eb5 am: 10b7d7d700 am: 8c6945f83c am: e58a68df0b
Change-Id: Ic68b1e4ad1673623d8c24bd10d8334a02ac51f90
This commit is contained in: