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

[automerger skipped] Merge "Handle invalid data during job loading." into rvc-dev am: 2ef87719 am: 41487df6 -s ours am: 0e2d69c0 -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/+/20026095



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