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

Change-Id: I6366148e3da573aa95e5b8e3016eab55e56efe23