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

Change-Id: If56e630962e992a8396c8276f2af88d981fdf1a9