Merge "Fold SDK Sandbox UID battery stats into parent UID stats" into tm-dev