Merge "Fold service-jobscheduler and service-blobstore into services.jar" into...

Merge "Fold service-jobscheduler and service-blobstore into services.jar" into rvc-dev am: defd8229 am: 75268bfd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11373905

Change-Id: I89697e9b233b5079ebb58f85879334a96288ef25