Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into...

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: ed43e6c0 am: d3b85a91 am: 435b043a  -s ours am: 4083e424 am: be2651bb6b am: 8691de6c am: e60aa74d44  -s ours am: 1012b55a am: 03255f9c am: be2f7034
am: d840ae0ffc

Change-Id: I2e982d5680c0d167108b9d3c51e350af27d12d0b