DO NOT MERGE Fix unexpected behavior in SDP

Bug: 68776054
Bug: 68817966
Test: Bluetooth SDP still works
Issue: FPIIM-2514
Issue: FPIIM-2515
Change-Id: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Merged-In: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
(cherry picked from commit ed45f06fbdfdd15298eedc5adc502dca5b7960c0)
1 file changed