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

Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8