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

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

Change-Id: I4ff0b0813c34812a24e5184de62b2818573ee1c9