Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5
am: fe616288dc  -s ours

Change-Id: I858b0c0f7d1b9e723857169bd7f29a55d82e0136