Merge "Fix NPE when assist data request times out" into nyc-dev

am: bc6d96e

* commit 'bc6d96e4d09ec71a2844ea4e9281b7e849a00f80':
  Fix NPE when assist data request times out

Change-Id: Ifb20aa2e1f246dacff008f539fce728c18abf14b

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -11983,8 +11983,12 @@ public final class ActivityManagerService extends ActivityManagerNative
         }
         if (receiver != null) {
             // Caller wants result sent back to them.
+            Bundle sendBundle = new Bundle();
+            // At least return the receiver extras
+            sendBundle.putBundle(VoiceInteractionSession.KEY_RECEIVER_EXTRAS,
+                    pae.receiverExtras);
             try {
-                pae.receiver.send(0, null);
+                pae.receiver.send(0, sendBundle);
             } catch (RemoteException e) {
             }
         }