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

[automerger skipped] Merge "Handle invalid data during job loading." into tm-dev am: f8449a01 -s ours am: d8df42f9 -s ours am: a0ec0b27 -s ours

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

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



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