Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d am: 9013d67f0c am: 7e5b9e3d32
am: 32ae78598d

Change-Id: I8125e8c8d043d1b9a7e41ce4aaa829dd0427ca23