Merge "Fix screen off after panel expansion" into tm-dev am: 659341ff am:...

Merge "Fix screen off after panel expansion" into tm-dev am: 659341ff am: 4a555ead am: 70a80cff am: afb382b0

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



Change-Id: Ifa1d8b414749ba4e0ade4e4e15e1376f7f9638be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>