[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 am: 2d3ff25f am: 123d7804 -s ours am: e94326e9 -s ours

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

Change-Id: I4b595b9369f40922f1ecb936fbd57c498e66a949