Merge "Fix ScreenRotation flicker from 90 to 270." into sc-dev am: aa4fa808 am: d6b3d3fc am: ee910157

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

Change-Id: If35a2170e17a2da3e1747a18d3290cdf31fb23ac