Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc  -s ours am: 3a20f7ceac am: be2651bb6b am: a7176293fd am: e60aa74d44  -s ours am: e053061edd am: 0eb01572ee
am: f422d3d9d5  -s ours

Change-Id: Id743f40cc7c604d2dbe3d70f1e52e99ddc07a4ca