Merge changes from topic "pdl-enum" am: b53c5e46

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



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