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 am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 am: 3e238e3396  -s ours am: 998001b4b2 am: d9421e7758
am: 48f906c852

Change-Id: I098c0cdb31cf4ca5da368d57cdf67089fe8a0cf8