am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev

* commit '4cccd58e4219ff1e974db201e064c85063dd262f':
  Expose userActivityTimeout through @SystemApi getter/setter.

core/java/android/view/WindowManager.java

@@ -16,6 +16,7 @@
 
 package android.view;
 
+import android.annotation.SystemApi;
 import android.app.Presentation;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -1590,7 +1591,19 @@ public interface WindowManager extends ViewManager {
         public final CharSequence getTitle() {
             return mTitle;
         }
-    
+
+        /** @hide */
+        @SystemApi
+        public final void setUserActivityTimeout(long timeout) {
+            userActivityTimeout = timeout;
+        }
+
+        /** @hide */
+        @SystemApi
+        public final long getUserActivityTimeout() {
+            return userActivityTimeout;
+        }
+
         public int describeContents() {
             return 0;
         }