Merge "Change the expected AP iface index when dual STAs supported." into tm-dev am: a2c1d763bd

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16993920

Change-Id: I39dd8b20086aa7f66e35a420f5238430ce6b5d5e