[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b9 am: cc4fd131 am: b2094f7c -s ours am: 6b16f719 Change-Id: I2f7ec847c4d781a80e950c3ede965456163c90f9