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

* commit '408ad99dd307ae93abec76821d343b8e080c99c9':
  frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.