[automerger skipped] Merge "Also reverse rotation for #freezeRotation path"...

[automerger skipped] Merge "Also reverse rotation for #freezeRotation path" into tm-qpr-dev am: d095a5e3 am: fea5a1d0 -s ours am: e9e160a9 -s ours

am skip reason: Merged-In I985ae560d8eff6ea063206c1e39bd694ab576fde with SHA-1 4c2b792c is already in history

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



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