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

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: bb3ccf55  -s ours am: e4ae9577 am: cdff42091b am: 43ad88e6  -s ours am: 21d6c860 am: 3ed9e7693d am: c4012677 am: 232824e01c  -s ours am: c4e0b955 am: 3add1fe7
am: bbdae082  -s ours

Change-Id: Id4af676e28e9e07b08976ec41a409312d4365727