Merge "PBAP C: Fix klocwork issues in PbapClientTestActivity"