Merge "Display-level relative display rotation should be 0" into tm-qpr-dev am: e0e646c47a am: b5fadd892f

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

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

services/core/java/com/android/server/wm/DisplayContent.java

@@ -6807,4 +6807,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
     DisplayContent asDisplayContent() {
         return this;
     }
+
+    @Override
+    @Surface.Rotation
+    int getRelativeDisplayRotation() {
+        // Display is the root, so it's not rotated relative to anything.
+        return Surface.ROTATION_0;
+    }
 }