Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3  -s ours
am: 5977c8b5bc

Change-Id: Ia362dd16d6a58e6c9c617fec169ed86b8eea8e50