Merge "[automerger skipped] Merge "Add a test for static IPv4 address...

Merge "[automerger skipped] Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev am: 1b93b670 am: 45d1fc38 -s ours" into rvc-d1-dev-plus-aosp am: 297d6763 -s ours am: 91587e74 -s ours

am skip reason: Change-Id I8f4a99da2351fdb5467f561a9732b14a8ebf674b with SHA-1 0e127d1f is in history

Change-Id: Iba321656d8d6eccd8c8461e7bef04d982bab1168