[automerger skipped] Merge "Show Dream Home Controls regardless of overlay on...

[automerger skipped] Merge "Show Dream Home Controls regardless of overlay on dream." into tm-qpr-dev am: b7fff582 am: d52cffc5 -s ours am: 296a42c5 -s ours

am skip reason: Merged-In I0f4da282f86a6087c48d5794a7b978e946104015 with SHA-1 65cdbc49 is already in history

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



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