Merge changes from topic "StablizeLibcoreSystemApi2" into sc-dev

* changes:
  Remove / annotate @CorePlatformApi(LEGACY) APIs in Android S as STABLE and as @SystemApi(MODULE_LIBRARIES)
  Squashed commits from aosp/master to mark some @CorePlatformApi as @SystemApi(MODULE_LIBRARIES) in sc-dev.