Merge "Support Wi-Fi DPP metrics categories in Wi-Fi DPP activities & fragments."