Merge "Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af4 am: a6905db1 am: d2832e32"