Merge "Revert "C2SoftHevcEnc: Increase supported resolution to 960x544"" am: 5bf1097c4f am: fd4eb82dca am: 0ab3022342

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

Change-Id: Ic89c2c3756521b42161944f8d274ae3be8e3022e