Merge "Add Wi-Fi DPP metrics category constants."