Merge "Fix stuck screen from display change timeout" am: 24213321 am:...

Merge "Fix stuck screen from display change timeout" am: 24213321 am: a63a9cac am: 531490b7 am: 636be011

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



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