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

Change-Id: Ie45bd66830e6e3e68be7e3f2692911ea4fa82fa9