Merge "hikey: Remove wifi_p2p from networkAttributes overlay" am: 4c345f7636
am: 9d266a5374

Change-Id: Ia0b34315b01c0a71fe683672fe3fff4f790c607c