Merge "Revert "Update subscription before broadcasting carrier config c...""