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

Change-Id: I0fdd993a71efd9bbe57b11e24eb47453e2c4bab4