Merge "Fix use-after-free in AMediaExtractor_getSampleCryptoInfo" into tm-dev...

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

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



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