Merge "Add a subId extra to the respond via SMS intent." into lmp-mr1-dev