Merge "Skip resize changing transition if display is rotating" into sc-v2-dev...

Merge "Skip resize changing transition if display is rotating" into sc-v2-dev am: 34ea03d9 am: 0398f368

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

Change-Id: I2615735bed1a12f726f1080a226003d0ec2be80b