Merge "NoMan: Filter group children for pre-L listeners" into lmp-dev