Code cleanup: removed P2P cases in case of RF detection

Bug: 335639730
Change-Id: Ibfecaf2c7df48de0cae1b62a220c7ca5d0de7421
6 files changed