Merge "Make confirm lock screen use the right theme" into oc-dr1-dev am: 98a9d341c8
am: 9b8f36e359

Change-Id: I08f5a9da6f6fac3206a5bb6df2e2106e91033863