Merge "MediaCodecInfo: limit resolution to 4K for 32-bit processes" am: 41ac3bae5f am: 8299672bb8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519906

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89705a23e8b9b5f660d2333a32c9b4fd2cc9b09d