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

Change-Id: Iac233acde24c37fd7f93faba312bc5d894bb224d