Merge "Show Dream Home Controls regardless of overlay on dream." into tm-qpr-dev am: b7fff582

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



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