Merge "AsyncTask terminating with exception calls onCancelled" into nyc-mr1-dev

core/java/android/os/AsyncTask.java

@@ -304,6 +304,9 @@ public abstract class AsyncTask<Params, Progress, Result> {
                     //noinspection unchecked
                     result = doInBackground(mParams);
                     Binder.flushPendingCommands();
+                } catch (Throwable tr) {
+                    mCancelled.set(true);
+                    throw tr;
                 } finally {
                     postResult(result);
                 }