Merge changes from topic "presubmit-am-449268fd2d8f40eb8f329fe53374868e" into tm-mainline-prod

* changes:
  [automerge] Change the expected AP iface index when dual STAs supported. 2p: 89b3de718d
  Change the expected AP iface index when dual STAs supported.