Merge "Allow dozing default display when other displays are awake" into tm-dev...

Merge "Allow dozing default display when other displays are awake" into tm-dev am: 2877d316 am: c21b39bc

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



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