Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""