Merge "C2SoftAomEnc: set AOME_SET_MAX_INTRA_BITRATE_PCT" into main am: e58ae29156 am: 887f63e4d4

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

Change-Id: Id8549852227676236c63f8ef972de87b2e10d1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>