Merge "Add a missing check for null pointer during closing of PBAP Service"...
Merge "Add a missing check for null pointer during closing of PBAP Service" into oc-dev am: 204c26d0 am: 4b9d1ee7
am: 2001b469
Change-Id: Ic3250776a76b4f1934f059d6e6061df1ee9429ee