Merge "Update the variable type to DrmStatus in libmedia_jni" am: 05ef0ed05d am: c4e7bf1875 am: dad34ff107

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2352604

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