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

Change-Id: I196204c683a0eacbe08103b383dcd9cb1435a43d