Merge "Do not wake the device if an activity starts while dozing." into tm-dev...

Merge "Do not wake the device if an activity starts while dozing." into tm-dev am: e2f44dc7 am: 48f3a910 am: d1ad3d1f am: 7ee20c05

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



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