Merge "Force top UI if we're expanded, per Jorim's suggestion." into rvc-dev am: b20343ffe0

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

Change-Id: Ifef804365dd900a1f3cff005f770bbc77273693f