[automerger skipped] Merge "Handle invalid data during job loading." into...

[automerger skipped] Merge "Handle invalid data during job loading." into sc-qpr1-dev am: 0973b10d -s ours am: 6bb9d6da -s ours

am skip reason: Merged-In Id0ceba345942baf21177f687b8dd85ef001c0a9e with SHA-1 7bdc1e8a is already in history

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



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