Merge "Merge "Merge "Turn off the verbose logging in the AppBatteryTracker"...

Merge "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" into tm-qpr-dev-plus-aosp am: cd2a852b

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



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