[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e  -s ours am: 8fe2b32637
am: 0c98432a94

Change-Id: If2baba2e684084a0ca5b74606675d5f0934a2833