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

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

Change-Id: I563a05951666935b0766879865ae5e5801e3a5ce