Merge "Remove hidden API usage in WM Extensions impl" into sc-dev

libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java

@@ -72,7 +72,7 @@ class SampleExtensionImpl extends StubExtension implements
 
     private List<ExtensionDisplayFeature> getDisplayFeatures(@NonNull Activity activity) {
         List<ExtensionDisplayFeature> features = new ArrayList<>();
-        int displayId = activity.getDisplayId();
+        int displayId = activity.getDisplay().getDisplayId();
         if (displayId != DEFAULT_DISPLAY) {
             Log.w(TAG, "This sample doesn't support display features on secondary displays");
             return features;

libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java

@@ -84,7 +84,7 @@ class SampleSidecarImpl extends StubSidecar implements
 
     private List<SidecarDisplayFeature> getDisplayFeatures(@NonNull Activity activity) {
         List<SidecarDisplayFeature> features = new ArrayList<SidecarDisplayFeature>();
-        int displayId = activity.getDisplayId();
+        int displayId = activity.getDisplay().getDisplayId();
         if (displayId != DEFAULT_DISPLAY) {
             Log.w(TAG, "This sample doesn't support display features on secondary displays");
             return features;