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

[automerger skipped] Merge "Handle invalid data during job loading." into rvc-qpr-dev am: 71e0ce30 -s ours am: 24e60ebb -s ours am: 5e4142a7 -s ours am: 6b12b6b3 -s ours am: 6ceb7cd7 -s ours

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

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



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