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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b5ef6d284bc2ed7ac9f4ebbb7b2aaaa53958700