Merge "Delay display DOZE on LS => AOD only if blanking is not needed" into tm-qpr-dev am: 2319065bcf am: eb0046e35b

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

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