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: 593ac000 am: 2babd683 am: 7ea35913

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



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