Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord" am: 658e6530ba am: 591a68a5a1
am: 587a8acb6c

Change-Id: I88459ae16e0492ea877983252aae03ad5714a306