Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev

core/java/com/android/internal/app/ShutdownActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server;
+package com.android.internal.app;
 
 import android.app.Activity;
 import android.content.Context;

core/res/AndroidManifest.xml

@@ -3028,8 +3028,9 @@
                android:process=":ui">
         </activity>
 
-        <activity android:name="com.android.server.ShutdownActivity"
+        <activity android:name="com.android.internal.app.ShutdownActivity"
             android:permission="android.permission.SHUTDOWN"
+            android:theme="@style/Theme.NoDisplay"
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.ACTION_REQUEST_SHUTDOWN" />