Merge "Fix software decoder display issue." am: 61a02211d0

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

Change-Id: I5a6803031e6d73d36af79ae62cf695f6209a3f07