Merge "Deleting lock screen clears all CA approvals" into nyc-dev am: c0440e5f4d
am: bf35a4d024

* commit 'bf35a4d024667a16c190c670e6ed28a9c68036fc':

Change-Id: Idc57203e071f46c499a857fe7dc8f1a32b4e180a