[automerger skipped] Enable CONFIG_INET_UDP_DIAG (update prebuilt)
am: 4918887651 -s ours
am skip reason: change_id Ib86a4eeec57ff485834be89e45510ae41ba2775f with SHA1 45f2af4300 is in history

Change-Id: I95d074ebf6b6ead973822bfd9ee155a0a1c0687f