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

Change-Id: Id90024c2155db8b9da83feecf4dddf370e3c610f