BtCarPbap Test merge from AOSP

Merging changes as new cl.
The original change was committed from pi_dev
then during merge form pi_dev to aosp Cl was edited.
Catching up with pi_dev on what was added from AOSP.

pi_dev cl 4052214
aosp cl 3908154

Test: All changes tested locally
Bug: 79165065
Change-Id: I61a341e220c98f3f11757eff5c29a33da80fcf0e
2 files changed
tree: f48aabbc41f03d35427f8c38c6a3ed0b2341765a
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg