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

Merge "[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: cddfa129 -s ours" into udc-dev am: 76736d6c -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: I4a1e7891517215ee03fbf10243b4f2d1c1b53302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>