[automerger skipped] Merge "AudioPolicy: engineconfigurable: WA to 32bits...

[automerger skipped] Merge "AudioPolicy: engineconfigurable: WA to 32bits limit criterion" into sc-dev am: 88e2a37c am: aa97ac19 -s ours

am skip reason: Merged-In I14baf6e6d66adaf5de040c143523bde72a32ed9c with SHA-1 07f30316 is already in history

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

Change-Id: I059030cdda578153fcc770808c0089f2fdcadbbb