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

Change-Id: I5337d332d52912983b48707a7b419366c3301741