Default to the new lockscreen layout for AOSP

The old layout has issues with spacing and the new large clock, and is
in the process of being removed.

Fixes: 189909942
Test: manual
Change-Id: I2c2da5184330c0fa4e2f5ea81f7d93518f172b2d