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

Change-Id: Ifc7c721dd32193b86d28cd136bc79308bbd3ef18