[automerger skipped] [Pandora] Merge servicer codegen from avatar interface...

[automerger skipped] [Pandora] Merge servicer codegen from avatar interface am: d01cf01f am: 6e962cb9 -s ours

am skip reason: Merged-In I036b7274ad331b5576f40b96849be500a220335f with SHA-1 d01cf01f is already in history

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



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