Merge "Fix use-after-free in AMediaExtractor_getSampleCryptoInfo" into tm-dev am: ce01b72e

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



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