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: I799a0c18fdea443f185740deaa3e982f98f12877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>