Merge "Add a missing check for null pointer during closing of PBAP Service" into oc-dev
am: 90cad4dd0e

Change-Id: I9ac185faf00cbc0e6485323e7ceaab707d956462