Merge "Don't collapse the panel post launch if we went back to sleep." into...

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

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

Change-Id: Ibf080d590328ee28fcb02aafbc16560b94325fa1