Merge "Add p2p band and frequency debug info" into tm-mainline-prod