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

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

Change-Id: Ic9e1d45348d10a62ed3ced79f41bfeb770cbc18a