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