Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev am: dde0e6ad21
am: ee58159419

Change-Id: I47058edb24ab179ccda4e12880b4c022cd33f563