Merge "Adding more owners for DRM" am: cf49f364a8 am: bfdbb25c0a am: e881a62014

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

Change-Id: I98b5fd1df54c7b743d1810a9b4e22da71a12d99e