[automerger skipped] Merge "Dynamically configure CtsMediaTestCases" into nougat-cts-dev
am: 495ca15438 -s ours
am skip reason: SHA1 495ca15438 skipped by user aaronholden

Change-Id: Ib4e48083010430500aa3aad285540daafe8587d9