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: ad921beb am: 0a534918

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



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