Merge changes from topic "pdl-enum" into tm-mainline-prod am: 41a64522 am: d75cf65a

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



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