Merge "Fix the issue that rtsp video with MP4V-ES/ can't be played." am:...

Merge "Fix the issue that rtsp video with MP4V-ES/ can't be played." am: 9bdfe6d8 am: 47332375 am: c4d6cd21

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

Change-Id: I2e776fbf142a3f20567e74e363c9b2c2e1b956d0