Merge "wifi: add RequiresApi annotations" into sc-dev