Merge "Refactor OWNERS files for Android Core Networking" am: 51c73d30d2
am: 20354df0ad

Change-Id: Ibb7bdf65182eac291b1d55e4c7b62564a69b36a5