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