Merge "Avoid intermediate orientation change" into sc-dev am: eee1089c am: 3485d979 am: 44e22af9

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

Change-Id: I69264fb7f224e0f6c40cc90c93002b345b0a6a9d