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

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

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



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