Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev am: 60b2ea959d  -s ours
am: fcc8d6c900

Change-Id: I0422c6b824af052ba01bec484f400a2ff91d9890