Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806 am: 8d0eb01843

am: 00f135d1be

Change-Id: I135fab3c06ec72ace8b43d2355ee5ba578306a1c

core/java/android/bluetooth/le/ScanRecord.java

@@ -117,7 +117,7 @@ public final class ScanRecord {
      */
     @Nullable
     public byte[] getServiceData(ParcelUuid serviceDataUuid) {
-        if (serviceDataUuid == null) {
+        if (serviceDataUuid == null || mServiceData == null) {
             return null;
         }
         return mServiceData.get(serviceDataUuid);