Merge "Defer rotation change while running display change transition" into...

Merge "Defer rotation change while running display change transition" into tm-qpr-dev am: f2bca1c2 am: 1a308163

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



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