Merge "p2p: check device capabilities before launching this app" am: f15d5b7741 am: acd0ad6ab9

Change-Id: Iac6c579cefefdd6b3d2f437a8fb281833ba32874