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

Change-Id: I37ccabcb68fbf3f09ec8114493fddceae90a6a23