Merge "[media][sfplugin] fix -Wdangling-gsl"
am: d3dd89caab

Change-Id: I2f37b8c80a71fac98926e6017729b4165fc916db