Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord"

am: 658e6530ba

Change-Id: I46dae495ee3214d0e1d9c8a7d191256423256b3a

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

@@ -116,6 +116,9 @@ public final class ScanRecord {
      */
     @Nullable
     public byte[] getManufacturerSpecificData(int manufacturerId) {
+        if (mManufacturerSpecificData == null) {
+            return null;
+        }
         return mManufacturerSpecificData.get(manufacturerId);
     }