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

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



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