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

Change-Id: I68339b6b5efab5ac8fe72bbbd7c96da59bc24b2e