Add support for parameter to CustomQuery

Fix: 313825260
Test: npm run test:presubmit
Change-Id: I44a3bdf1c8ce1c8b533512f40135995623424918
5 files changed