Merge "Don't collapse the panel post launch if we went back to sleep." into tm-dev am: a90351d7

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

Change-Id: I7afe8e8d8b8ceceef8d1df7c2bf927f760adbacc