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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib78afdece9a00c7ecf4df734e6458a28ba63d6cc