Merge "Unbind screenshot connection even if the binding attempt fails" into udc-dev

core/java/com/android/internal/util/ScreenshotHelper.java

@@ -195,6 +195,8 @@ public class ScreenshotHelper {
                         UserHandle.CURRENT)) {
                     mScreenshotConnection = conn;
                     handler.postDelayed(mScreenshotTimeout, timeoutMs);
+                } else {
+                    mContext.unbindService(conn);
                 }
             } else {
                 Messenger messenger = new Messenger(mScreenshotService);