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

Change-Id: If6c8ab5479b950eb7473edfe8d5ed2a02beeb865