Move advanced search inputs back into the form

Follow up to Ic6ec29817ab7deadc6bc7125f8b4cd16686baa04

Bug: T78553
Change-Id: I6c8892e7742bac730154a66ab2bbb9c37ef3af9d
Merge "Move advanced search inputs back into the form"