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