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

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



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