[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 am: aa6f2a56 -s ours am: d67cb502 -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: I373ce7e4f9836a4c746ff0d2a469cbf169f304e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>