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

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



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