* commit '12410ca93bdbbfdf028163eaf9f341a74152b8f2': Revert "DO NOT MERGE - Hide new SmsManager API's dealing with SubId"