Merge "Add test for CM#setAvoidUnvalidated" am: 13549792e2

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

Change-Id: I0431134cfd124e0602b32a26425d2fb943f9f95a