Merge "Fix use-after-free in AMediaExtractor_getSampleCryptoInfo" into tm-dev am: ce01b72e am: 236af7da am: f93db8d7 am: 219ba09d

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



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