Merge "MediaCodec: require Crypto/Descrambler object for secure codecs" into...

Merge "MediaCodec: require Crypto/Descrambler object for secure codecs" into main am: 28c70d58 am: 62ec24fc

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3256899



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