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

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



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