Merge "Mark connectivity test utilities as module API" am: c74d6f3115 am: ea30ec0379

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10d521b26061821ab1ee57d1938416163d93de92