Merge "Unbind from dream overlay in onUnbind." into tm-dev am: 493062c5

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



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