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

* commit '28b1df3b8abffc25fe0b04391e2ce4d0f8ece966':
  Deleting lock screen clears all CA approvals

Change-Id: If151d35e903a8006ae0dacbdb84bd8ffd0c90916