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: ea35b28d am: c396d522
am: 03ff2e19cb

Change-Id: I64e383f28438becd8be42a51913f40b1649bdf96