Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3  -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324  -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9 am: 232824e01c  -s ours
am: 257cf16de3

Change-Id: I1677fdf4dcfe9fe96de22f4cdfb67225b4d86a2e