Merge "Allow null subscriberId in NetworkStatsManager." into pi-dev