Merge "Exclude SDK Sandbox virtual UID from BatteryUsageStats" into tm-dev