Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev
am: 19b09dd0d3  -s ours

Change-Id: Id030cd83f6759c255c1a5cfbea8b90a92610a02d