Merge "Adjust visibility rules for migration" am: 4a1b876a1e am: c88e16c4ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I449496e24ddbb70e848a97b9f26bda5859a9a9db