Merge "ACodec: defer setSurface at OutputPortSettingsChangedState" am: a16b76a3e1 am: 2a867b6c71

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

Change-Id: I4355d6f0afd52029a8e6d841ed944685eb305d8d