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

Change-Id: I92c466da144a731bab41e829ba1ad29fbbf789f7