Merge "Usages of S APIs should be encapsulated in a method annotated with @RequiresApi" into sc-dev