[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113
am: b2094f7c37  -s ours

Change-Id: I202fe25cf207a5063f897d13617fc0a03fe2ca83