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

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

Change-Id: I421b9a36b66ea3ef56f4bf489eaaca52e2314f68