Merge "[automerger skipped] Inform the DNS resolver when it needs to do DNS64...

Merge "[automerger skipped] Inform the DNS resolver when it needs to do DNS64 synthesis. am: 7f7171c6 -s ours am: cff16409 -s ours" into rvc-d1-dev-plus-aosp am: dadab63a -s ours

am skip reason: Change-Id If8ad2d30712a6df3e207c8d3e8a129705242191e with SHA-1 7f7171c6 is in history

Change-Id: I01ad9fba695fe8fb1d3fc6ff047edaf68dcc10a1