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

[automerger skipped] Merge "Handle invalid data during job loading." into sc-dev am: 1a150853 am: 37996032 -s ours am: 5bf9e094 -s ours am: cc268c88 -s ours am: 3fae00fa -s ours am: 8d89d636 -s ours

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

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



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