Merge "PBAP: Close mServerSockets when shutting down service" into oc-mr1-dev