Merge "Add netLegacyApi22 tests to postsubmit" am: 29fbcd8113 am: 83b6d2bbf5 am: c8515f2f0e

Original change: https://android-review.googlesource.com/c/platform/cts/+/1675546

Change-Id: I5fe7d356cd27dbbb16b5449b43f441550d04bbd8