Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613
am: 4cc21e3de2
am: 56951b0e0c
am: 22bcacefcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694 Change-Id: I8872ba929af93cd9a078e86366d30a9595a8632c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: