Merge "SystemServer: cherry-pick p2p service start"
am: 4c937464eb

Change-Id: I6f851c4e157150cab541d9a991cc1b7fe736eb7c