Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642
am: 5bc4962e53  -s ours

Change-Id: Ibd76e7968c99b10e21ecfe313fb584a64ac41951