Merge "[VCN07.7] Add NOT_VCN_MANAGED capability into ConnectivityControllerTest" am: 7a0ceca5e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia914e653708c4521f7c9e70de7b912f43230a452