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: 352213a1 am: 3d6d49f2

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



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