Merge "Moving NPMS related tests to cts" into main am: cc2877cfb7 am: 59a2d22961

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3196957

Change-Id: I9bbcdc028d2f416d8fd39dbf066517a9244987e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>