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

Change-Id: I9e410ce2d5302eda87aea9628cb58ca203a212c5