Merge "Not use SubscriptionInfoEntity in DataUsageList" into main