Merge changes I027cc96c,I44bb8191 into tm-qpr-dev

* changes:
  Add a TestableAlertDialog
  Pass Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS