[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 am: cafe0c44 -s ours am: f69ce7fd -s ours

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

Change-Id: Id15ee26ce49ffaffc1bee4130afcd8d0d6b002e4