Merge "Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped."" am: fbc849e9d8 am: 423a67e7aa

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

Change-Id: I424622d3590d3d48bad323ea19c7806a945e44f5