Merge changes from topic "aris-backport-rvc-dev" into rvc-dev

* changes:
  Make Activites touch opaque - DO NOT MERGE
  Revert "Make Activites touch opaque - DO NOT MERGE"

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

@@ -86,6 +86,10 @@ class ActivityRecordInputSink {
             mInputWindowHandle.layoutParamsFlags &= ~WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
             changed |= notTouchable;
         }
+        if (mInputWindowHandle.displayId != mActivityRecord.getDisplayId()) {
+            mInputWindowHandle.displayId = mActivityRecord.getDisplayId();
+            changed = true;
+        }
         return changed;
     }