Merge "Reduce more power advisor churn" into tm-dev am: 8ffb0288 am: 343754f8 am: 6a3b4840

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



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