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

Change-Id: Iba3b6ff14fdab510e1e0c8fae7298be290e93bf1