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 am: 959b1aa5b9 am: 7caccc107f
am: 1dcec33349  -s ours

Change-Id: Ibc2d0fd88e89b0553cf5c9542457172692271318