[automerger skipped] Merge "Add one metrics field to record the cause of DNS...

[automerger skipped] Merge "Add one metrics field to record the cause of DNS query internal error" into rvc-dev am: 8128fed2 -s ours am: 0a4d8228 -s ours am: c6e5d4dd -s ours

am skip reason: Change-Id I2214089ed7b350c2f4d9e86131c0568164192875 with SHA-1 739b1d79 is in history

Change-Id: I2389c2d8da37e2129f4a4e7d51e9c48b59256405