Merge "Handle video track with invalid WxH to avoid mediaserver crash" into...

Merge "Handle video track with invalid WxH to avoid mediaserver crash" into main am: bd98dc51 am: 3ad45f3d

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



Change-Id: I2a784627771ef96968cbbc99ce44fce0d104c108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>