Merge "Register User change only for pbap & avrcp" am: 7159fa9f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2595876



Change-Id: I242f89c79024ec165c81ee98f53b82c73b2c5d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>