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

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

Change-Id: I8cd5c9da0309e3928ac0c1b9ed1014adb730e68c