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

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

Change-Id: I607d16ec05b689baa8eac9e3322526818f6d464c