Merge "ExpressLog integration for JobScheduler" am: dc7b608720 am: fe1ec1044c

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

Change-Id: I79b5cfce8baa3457b0fc7f8fbb36417cb2809222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>