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

Change-Id: I70bfe58ce090142cca39f7a7a4392ede22233420