[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

Change-Id: I415699ef7883dfac9b511a089eb15190a367dd8a