Merge "SubInfoRecord.aidl renamed to SubscriptionInfo.aidl"