Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485
am: 95b604ccb5

Change-Id: I78d80c17e2b7a0b6d0d611f738a3b880dd74dab0