Merge "Merge "Turn off the verbose logging in the AppBatteryTracker" into tm-dev am: abeb3828 am: af3dc5f9" into tm-d1-dev-plus-aosp am: 3c8f5db8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18181706



Change-Id: I564c8a27eaaa1694ab3f3ead14a99d2c6d16f9d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>