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

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



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