Merge "Release doze wake lock when doze dream is stopped" into tm-qpr-dev am: e37a7d5e

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



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