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

Change-Id: I0273945795e743e3508b9691c388b7fd3a32cdbc