[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e  -s ours
am: 050b9170db

Change-Id: If64625b574530db5f9d3ce01871fb8ea38ad9ca3