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 am: d6ee2304

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



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