Merge "Release doze lock when the dream component changes" into tm-qpr-dev am: 3437745a96 am: 88068858d3

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

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