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

Change-Id: If181bcf1fea4003a9ddce017974cd7f76fe642b9