Merge changes from topic "per-app-cts" am: 5f78e30839 am: f9eb2c7b0b am: 64132f489a

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

Change-Id: I7c5a36617fb3d5b401daec80b48a069b5538fac3