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

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



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