[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37  -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615 am: bd752f7d88  -s ours am: da12b4b0f0
am: c061dcda05

Change-Id: I213de9a0eda5b374833557d4aed2c1b9184a6a15