Merge "checkCarrierPrivilegesForPackage by subId rather than default" into qt-dev
am: 4d99a95d35

Change-Id: Ifcb3e0f3fef15004188d8d25cfaccc6b8527072a