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

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



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