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

Change-Id: Ie8be52ca401883516b0e746ee9211c4a44460e1c