Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev