Merge "Fix null pointer derefernce AMediaDrm_setPropertyByteArray" am:...

Merge "Fix null pointer derefernce AMediaDrm_setPropertyByteArray" am: b06ffd2b am: f7b34733 am: 886a6634 am: 5a20a591

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



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