Merge "Merge "Add testutil to mock android.app.usage.NetworkStats" into main am: 24b9bd7fa6 am: 59061ebbb6" into main