[automerger skipped] Merge "Dynamically configure CtsMediaTestCases" into nougat-cts-dev am: 495ca15438 -s ours am: 8297c4cab7 -s ours am: ae98622f8f -s ours am: 037791b458 -s ours
am: 7a6b48fb4c -s ours
am skip reason: change_id I7e9e027a9184ad75f8c488bd1199a3925fac652f with SHA1 b8ccdbe1e9 is in history

Change-Id: I73b647da4f72d4cfa2f05b3410d372d2a57bee32