[automerger skipped] Merge "Move rotation flags to SF" into udc-dev am:...

[automerger skipped] Merge "Move rotation flags to SF" into udc-dev am: f8710d14 am: 90c1c27f -s ours am: 526129e2 -s ours am: ca7715b7 -s ours

am skip reason: Merged-In I5532e140a603be222cb3ea1ae563638317c1d745 with SHA-1 85d4b228 is already in history

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



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