Merge "Add DRM Hal pulgin version in MediaDrm atoms" am: edd344ab42

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

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