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

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



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