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

Change-Id: I3e9a492bbdecc5335047c1687d2a7a6e8c33025f