Merge "[Pandora] Merge servicer codegen from avatar interface" am: a3ba861f am: 6dd7d504

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



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