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

Change-Id: I3b2c2deef4e688a4966f23ab30eb97ee1a3e1815