Merge "Add OWNERS for upcoming MediaStore work."
am: 1615f5746e

Change-Id: I842ffdbeebabdccfa53c27fa1e54419df808fa3a