Adjust SpecialWatchlistQuery hook usage for Iec4aab87 in core

Ensure compatibility with both MW 1.22 and MW 1.23.

Change-Id: I4791ab18ca2595ba7f531ebc86488fad2581778c
Merge "Adjust SpecialWatchlistQuery hook usage for Iec4aab87 in core"