Merge "Fix CtsNetTestCasesLatestSdk fail on Q platform" am: 114a0914bd

Change-Id: I16a1048ac92ecf1499f55a703346fa57b96931b4
tree: 8f5393cec83550de784b5eef488c0ce275567b14
  1. tests/