Merge "MediaCodecInfo: do not alter performance points for 32-bit processes (2)" am: a78fa61ba8 am: 41bf6fa76f

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

Change-Id: Ia2fb9292e584c29c1894a2ed9774c9c4e40350d4