IA2: Re-include files that use l2cap psm constants am: 805d0fdd am:...

IA2: Re-include files that use l2cap psm constants am: 805d0fdd am: 801d7aba am: 7cffae57 am: 697f824e

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



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