Merge "pdl: use explicit diff labels" am: b74a3884 am: d9097399 am: 11ca8285

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



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