Merge "DO NOT MERGE - Hide new SmsManager API's dealing with SubId" into lmp-dev