Merge tag 'android-8.1.0_r33' into oreo-x86

Android 8.1.0 release 33

diff --combined core/java/android/app/Activity.java
index 2436fe8,8dc558c..b3969cb
--- 1/core/java/android/app/Activity.java
--- 2/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@@ -126,8 -126,6 +126,8 @@@ import com.android.internal.app.WindowD
  import com.android.internal.policy.DecorView;
  import com.android.internal.policy.PhoneWindow;
  
 +import org.android_x86.analytics.AnalyticsHelper;
 +
  import java.io.FileDescriptor;
  import java.io.PrintWriter;
  import java.lang.annotation.Retention;
@@@ -761,7 -759,6 +761,7 @@@ public class Activity extends ContextTh
      boolean mFinished;
      boolean mStartedActivity;
      private boolean mDestroyed;
 +    private boolean mAppsStatistics;
      private boolean mDoReportFullyDrawn = true;
      private boolean mRestoredFromBundle;
  
@@@ -1021,7 -1018,6 +1021,7 @@@
          }
          mRestoredFromBundle = savedInstanceState != null;
          mCalled = true;
 +        mAppsStatistics = SystemProperties.getBoolean("persist.sys.apps_statistics", false);
      }
  
      /**
@@@ -1246,12 -1242,6 +1246,12 @@@
  
          mFragments.doLoaderStart();
  
 +        // region @android-x86-analytics
 +        // screen view
 +        if (mAppsStatistics) {
 +            AnalyticsHelper.hitScreen(this);
 +        }
 +        // endregion
          getApplication().dispatchActivityStarted(this);
  
          if (mAutoFillResetNeeded) {
@@@ -5882,6 -5872,16 +5882,16 @@@
      }
  
      /**
+      * Temporary method on O-MR1 only.
+      *
+      * @hide
+      */
+     @Override
+     public ComponentName getComponentNameForAutofill() {
+         return mComponent;
+     }
+ 
+     /**
       * Retrieve a {@link SharedPreferences} object for accessing preferences
       * that are private to this activity.  This simply calls the underlying
       * {@link #getSharedPreferences(String, int)} method by passing in this activity's