Merge "ensure module push the dynamic config before querying it" into android12-tests-dev