Merge "Add Oli and Nikita as OWNERS for Apex-related changes." am: c4e86a6f74 am: bab41616c4

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

Change-Id: I186b61e1557039aa3858ab9125c8515e2ce44159