Merge "Adding more owners for DRM" am: cf49f364a8

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

Change-Id: I36aadea5b0c86e6dc39279b53a54a6dbc4809036