Merge "Add olly@ and aquilescanta@ to media OWNERS" am: 24be95826c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466102

Change-Id: Ic6e1764bff710a85b7555a6562cb9f12aee4489f