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

Change-Id: I3c8f931cfea06e44853bd21ffd237562b4f45677