Merge "Migrate Contextual Search code to AOSP" into main