Merge "DrmStatus type checks" am: b549ebce63 am: ae81ba6d9e

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

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