Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into...

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa am: a278a1e6 am: 3d995d6f  -s ours am: 4f77ca16  -s ours am: 959b1aa5 am: 7caccc10 am: 1dcec333  -s ours am: 2ef2d90e am: b2e8361c am: c147db7a am: 3e238e33  -s ours am: 998001b4 am: 04ff2b88
am: 2040a257  -s ours

Change-Id: Ie7054516a05633452811e3d4a482d99e150499b9