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: 9677b9c9

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



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