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

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



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