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: 6ac86ae1db am: 9030016e5f am: d840ae0ffc
am: bd4ee6e96c  -s ours

Change-Id: I797025d97b6a15040140368758ac7614b335b49f