Merge "Refactor OWNERS files for Android Core Networking" am: 1d7966bd46
am: 151677dc51

Change-Id: Ie3d009a984a961e28b067d96f214ec4da90a5bb5