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

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

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



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