Merge the 2019-04-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  [wpa_supplicant] Fix security vulnerability wpa_supplicant/wnm_sta.c:376

Change-Id: I8098a3c25f2e98e261f5f210a3db713dba581d0d