Merge "Allow background default container service in a less crashy way" into oc-dev

core/java/android/app/IActivityManager.aidl

@@ -635,6 +635,11 @@ interface IActivityManager {
      */
     int getLastResumedActivityUserId();
 
+    /**
+     * Add a bare uid to the background restrictions whitelist.  Only the system uid may call this.
+     */
+     void backgroundWhitelistUid(int uid);
+
     // WARNING: when these transactions are updated, check if they are any callers on the native
     // side. If so, make sure they are using the correct transaction ids and arguments.
     // If a transaction which will also be used on the native side is being inserted, add it