[automerger skipped] Handle invalid data during job loading. am: d221eda618 -s ours am: 0c0f2dd197 -s ours am: 05fa6e4ae7 -s ours

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

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

Change-Id: Ib4818adac52e47de875bcdb1e5441c3f4e4ab640
Signed-off-by: Automerger Merge Worker <[email protected]>