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

Change-Id: I0c7d7db1dcc585477d5f7841137b5603270eabe6