Merge "Add one DNS metrics field to record DNS internal error" am: 4b12977908 am: 405a14ae2a

Change-Id: I8b2ee5c775154d1e56b2635aac4d4777c467887b