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

Change-Id: I0ff3b20fc2f3318070e343dfe6dc29b2979284ef