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

Change-Id: I4b7cfdd5cad8ab054bb1e03279eb27a302c6acc2