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