[automerger skipped] Merge "Disable ADPF CPU hints for SF unless active...

[automerger skipped] Merge "Disable ADPF CPU hints for SF unless active display is on" into tm-qpr-dev am: 0d6f11f9 am: 7110dc0c -s ours

am skip reason: Merged-In I4fa617a108f14da9df278c4a449795363ec29cf3 with SHA-1 ba8d15a1 is already in history

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



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