Merge "Remove hidden deprecated getActiveNetworkQuotaInfo"