Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev

am: fb5995cfbb

Change-Id: I5f649b54038b586be375394d35fd34453213df0a

core/java/android/app/ActivityThread.java

@@ -1180,9 +1180,12 @@ public final class ActivityThread {
                 AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {
                     @Override
                     public void run() {
+                        try {
                             dumpDatabaseInfo(dup.getFileDescriptor(), args);
+                        } finally {
                             IoUtils.closeQuietly(dup);
                         }
+                    }
                 });
             } else {
                 dumpDatabaseInfo(fd, args);