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

Change-Id: I7ffc9b61fbfe670a68049b94a05415abec38e36e