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

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

Change-Id: I20852d21a77f252ef8bdab06f2b00ac9f3daab1d