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

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

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