Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53  -s ours
am: 8305951cca

Change-Id: I92d2761c392537a1e49a5392e224c1809b311f98