Fix QS CTS failure caused by tile backup

am: 34f6cbc288

Change-Id: Ic82ccc386b8ab81797e748893b831601c34c12ce

packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java

@@ -129,6 +129,12 @@ public class TileLifecycleManager extends BroadcastReceiver implements
     }
 
     public void setBindService(boolean bind) {
+        if (mBound && mUnbindImmediate) {
+            // If we are already bound and expecting to unbind, this means we should stay bound
+            // because something else wants to hold the connection open.
+            mUnbindImmediate = false;
+            return;
+        }
         mBound = bind;
         if (bind) {
             if (mBindTryCount == MAX_BIND_RETRIES) {

packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java

@@ -95,6 +95,7 @@ public class TileServiceManager {
         if (!TileLifecycleManager.isTileAdded(context, component)) {
             TileLifecycleManager.setTileAdded(context, component, true);
             mStateManager.onTileAdded();
+            mStateManager.flushMessagesAndUnbind();
         }
     }