Merge "MediaTesting: Add ESDS unit test" am: e084ff906c

Change-Id: I70ce8841f96227d3b5cc4dee5f1e4b4ad8ec18ce