[automerger skipped] [automerged blank] pdl: Fix cherry-picking conflict with...

[automerger skipped] [automerged blank] pdl: Fix cherry-picking conflict with aosp-master 2p: 71a94463 am: 9ab5fc3b -s ours

am skip reason: Merged-In Idfbf269d253f93786a63ebdb810c6200da0d2c45 with SHA-1 482fad05 is already in history

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



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