Merge "FilterSms in carrierSmsFilter should timeout if onFilterComplete()...
Merge "FilterSms in carrierSmsFilter should timeout if onFilterComplete() callback is not received" am: 1a8df66f
am: 7ff5b78e
Change-Id: I2ced3c32e3b1038594672c702393490ba7c28687