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

Change-Id: I5ddc834a7c50ae260704ce9d53c954cfb55bec7b