Merge "Fixed NPE when cancellation signal is null." into oc-mr1-dev

am: fac2141f4e

Change-Id: Ib89a4888b3776dd6eb2ff3754c027b2ec54e4c56

services/autofill/java/com/android/server/autofill/RemoteFillService.java

@@ -562,7 +562,10 @@ final class RemoteFillService implements DeathRecipient {
         void onTimeout(RemoteFillService remoteService) {
             // NOTE: Must make these 2 calls asynchronously, because the cancellation signal is
             // handled by the service, which could block.
-            remoteService.dispatchOnFillTimeout(mCancellation);
+            final ICancellationSignal cancellation = mCancellation;
+            if (cancellation != null) {
+                remoteService.dispatchOnFillTimeout(cancellation);
+            }
             remoteService.dispatchOnFillRequestFailure(PendingFillRequest.this, null);
         }