Merge "Update dream battery drain monitoring to exclude when charging is being...

Merge "Update dream battery drain monitoring to exclude when charging is being artificially limited." into tm-qpr-dev am: e223e2bd

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



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