Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e
am: a278a1e660

Change-Id: I22838d21bdd289ca34b78260ade59adafbdc408a