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

Merge "Merge "Turn off the verbose logging in the AppBatteryTracker" into tm-dev am: abeb3828 am: e615ba7f" into tm-d1-dev-plus-aosp am: be7a48cd

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



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