[automerger skipped] Merge "WM: Handle primary display orientation when calculating the transform hint" am: 5fb9f63795 am: b83ee72e64 am: 7f84221a10 -s ours

am skip reason: Merged-In Idf010cd6be73172ba708820f87046c3ba3cf8001 with SHA-1 d6f2c5882f is already in history

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

Change-Id: I9a975136c471bcfbf477990b9ebe3b0a05bec71a