Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master

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