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

Change-Id: I495579b3cca396dd5fb6a628bedb5e5be4916b26