[automerger skipped] Merge "Dynamically configure CtsMediaTestCases" into nougat-cts-dev am: 495ca15438 -s ours am skip reason: SHA1 495ca15438 skipped by user aaronholden skipped: 7085d5e16b skipped: a55fdf8a3b skipped: 95dca97e83 skipped: 128d37dd54

Change-Id: Ie9beed206ba891d101e697b7843a5cc19e6127f2