Merge "MediaCodecInfo: Change default alignment and block size to 1x1" into main am: fa33da558c am: 29edabbfb7

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

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