[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5
am: 3758253ae8  -s ours

Change-Id: I0836ddb1649084a6814c461bccc41135cb475337