Merge changes from topic "presubmit-am-f6a3dc4aa5e04877a31cf3a49c4a0612" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Set the offset of the dim layer of DisplayArea. 2p: b1bd44227c
  Set the offset of the dim layer of DisplayArea.

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

@@ -644,7 +644,9 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
         void prepareSurfaces() {
             mDimmer.resetDimStates();
             super.prepareSurfaces();
+            // Bounds need to be relative, as the dim layer is a child.
             getBounds(mTmpDimBoundsRect);
+            mTmpDimBoundsRect.offsetTo(0 /* newLeft */, 0 /* newTop */);
 
             // If SystemUI is dragging for recents, we want to reset the dim state so any dim layer
             // on the display level fades out.