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

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



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