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

Change-Id: Ifba32cf89392b19034ed0c88c9d02f48bc5e4852