Merge "Skip display rotation animation for non-change type transition" into udc-qpr-dev am: b0c6ad697c

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

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