Merge "Mark TestNetworkManager as module API" am: 24ea1e0377 am: ae781e1b30

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I363b288609514251f1e5ec337f56368180d2b259