Merge changes from topic "am-87b917ecc64245d2b1700a4be7e0896e" into tm-qpr-dev-plus-aosp

* changes:
  Merge changes from topics "cherrypicker-L37600000955090666:N36200001273131748", "cherrypicker-L79000000955070414:N24400001272804687" into tm-dev am: f51f239b am: 7c0a8745 am: a8e00228
  media: Remove EncodeDecodeTest and DecodeEditEncodeTest from postsubmit am: cad7f4a6 am: 923f0a56 am: b0ea0a93
  [automerger skipped] media: Remove EncodeDecodeTest and DecodeEditEncodeTest from presubmit am: 5000473c am: 5bbc1f7e -s ours am: 489e5b6c -s ours