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

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

Change-Id: I90ebd5e6b70067dff57aab16ad88c4cc0983ece6