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

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

Change-Id: Iae296c10c2fce01c41076455be7646e7bf7918f4