Merge "Add onDvbcAnnexReported ScanCallback"