Merge changes I77f49fe8,I305e927a into lmp-dev

* changes:
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."