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