[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e  -s ours am: 050b9170db am: b367200be4 am: ef74f3b079  -s ours am: 0f464f9d77 am: 1682f67177 am: 13ac17ab3a
am: ec220f645f  -s ours

Change-Id: If90aff1167803a965e938f9e174ec1df09401b85