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

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

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