Merge "Prevent flicker on orientation change while starting" into tm-qpr-dev am: ceebff75

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



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