[automerger skipped] Merge changes from topic "pdl-enum" am: b53c5e46 am:...

[automerger skipped] Merge changes from topic "pdl-enum" am: b53c5e46 am: 270950b5 am: 43493b94 -s ours

am skip reason: Merged-In Ic79a818a082cedac38c0d103a7b1e1abd60914fb with SHA-1 ac989337 is already in history

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



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