Merge "Do not wake the device if an activity starts while dozing." into tm-dev am: e2f44dc7f2 am: 9677b9c99f am: d0684cbb3b am: 85a47b304e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344926 Change-Id: I765b7457a083c67571eaa2891d8cde3488cc028a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: