Merge "Fix the issue that rtsp video with MP4V-ES/ can't be played." am: 9bdfe6d8ab am: 47332375f9 am: c4d6cd214e am: d54a480955

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2005510

Change-Id: If04f7bab80c79c94f7d8b8b24c2253bd81c8dbe5