[automerger skipped] Merge "audio: Add a missing break to EffectsFactory::getAllDescriptors" am: ef84854472 am: a48f128741
am: 4bd30a632c  -s ours

Change-Id: I46b656ce9c806907a951858e9512b2bd31c596df