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

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

Change-Id: I190ed65e23fc884c6f8d6fd6fb9886ace5fcc828