Merge "hikey: Remove wifi_p2p from networkAttributes overlay"