Merge "Clamp the scaling factor of battery usage in app battery tracker" into...

Merge "Clamp the scaling factor of battery usage in app battery tracker" into tm-dev am: d73ce7e2 am: 30ed8825

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



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