Merge "Add androidx.annotation_annotation as framework-wifi dependency" into sc-dev