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: Icda2fe62f38ebf473aed37f2176a5fb05f4ecd41