Merge "Connectivity OWNERS: let owners modify Android.mk" am: 05be68698b
am: a22fbf4534

Change-Id: I64895a50baca163588ce863f7fb93fad31d7f55b