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

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



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