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

Change-Id: Ic7d6f9255bb4ad82cf423687570d8f97af7dd74b