am ec25523b: Merge "CtsVerifier test for lock screen vulnerability fix" into jb-dev

* commit 'ec25523b4bcf9283267924597cc3f2f080d4e075':
  CtsVerifier test for lock screen vulnerability fix