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 am: 9afb44fa am: f070b5cc -s ours" into rvc-qpr-dev-plus-aosp am: 9bc7fa97 -s ours

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

Change-Id: If8661c956200e434af029a638d85193467049fd1