Merge changes from topic 'aosp-generics-api'

* changes:
  DO NOT MERGE Track generics in API definition.
  DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API