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

Change-Id: I9125dc1aa39189a43b3c68618853e0a7a7298fe2