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

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

Change-Id: I1f1f411025dc3efcdafc2e530962f8cc33ac7814