Merge "Inline readNetworkStatsDetailInternal, make mUseBpfStats final" am: dd98a70051
am: df3deaf33d

Change-Id: I8fc5e96150bc30ae87881feb5730be2fbb5891ac