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: 236af7da am: f93db8d7

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



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