Merge "nfc(api): Restore behavior from Android T" into udc-dev am: 004bbcdb14

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23755172

Change-Id: I1229f75c247f5fbce3238a40ff90d7ed2c74e581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/nfc/NfcAdapter.java

@@ -711,6 +711,7 @@ public final class NfcAdapter {
                 /* Stale sService pointer */
                 if (sIsInitialized) sIsInitialized = false;
             }
+            return null;
         }
         /* Try to initialize the service */
         NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);