Merge "Fix software decoder display issue." am: 61a02211d0 am: 014e9586e6 am: 29e55ba3fc am: 2b34d5dded

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

Change-Id: I919e05fe76b6cc63f81e77d98c1f69a2595f2a2c