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

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

Change-Id: Ibf57a8fe0f49763b2bf1f7fe06c42851dde905cf