Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."