Merge changes from topic "aosp_merge_137323948_master"

* changes:
  Merge history of frameworks/opt/net/wifi
  Enable wifi MTS tests to generate android-mts-wifi as well as android-mts.