Merge changes from topic "idle_timer_per_display" into sc-v2-dev am: 9572027653

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

Change-Id: I32896c0cf1bb95feedba77c44ac3cd6b249260a9