Merge "Turn OFF any changing displays during device-state transitions" into sc-dev am: b4bed4d455

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

Change-Id: I264869a9fbc450203fd98fdb394c23ac771f0f6b