Merge "Prevent flicker on orientation change while starting" into tm-qpr-dev...

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

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



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