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 am: e743762d am: 50c19c84

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



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