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

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

Change-Id: Icb80230b79d4132d4c57683051b97b25ed97183d