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

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

Change-Id: Idcfc95ce0f44448aae7f217aa4f7501cb94af155