Merge "[ST01] Attributes data usage of test network by specifier" am: 1c685c1e97 am: be039ead35

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

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