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

* commit 'bf35a4d024667a16c190c670e6ed28a9c68036fc':
  Deleting lock screen clears all CA approvals

Change-Id: Ie0eaad842f5758142ce688132213f825b7784139