Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev