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

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



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