Merge "[RequiresApi] Add annotation for Passpoint and security API" into sc-dev