Merge "Add Filtering for snoop logs based on L2CAP and RFCOMM Channels (4/4)"