Merge "Inline readNetworkStatsDetailInternal, make mUseBpfStats final" am: dd98a700 am: df3deaf3 am: af8b64a1 Change-Id: I9125dc1aa39189a43b3c68618853e0a7a7298fe2