Merge "Reduce more power advisor churn" into tm-dev am: 8ffb0288 am:...

Merge "Reduce more power advisor churn" into tm-dev am: 8ffb0288 am: 6e9812c7 am: d9fdb5d7 am: c97d587a

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



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