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: I075ae8b6075612dd5c0874c2fe49d3dc276b5163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>