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 am: 2cc32e8d

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



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