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

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

am skip reason: Merged-In I985ae560d8eff6ea063206c1e39bd694ab576fde with SHA-1 4162d60f is already in history

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



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