[automerger skipped] Merge "BaseBundle: fix unparcel error logic" into tm-dev...

[automerger skipped] Merge "BaseBundle: fix unparcel error logic" into tm-dev am: 923ad094 am: cf35643b -s ours am: d22e92e8 -s ours am: 1abe7f2d -s ours

am skip reason: Merged-In Id423936872cbb0e0265ccf2855092357cb175d47 with SHA-1 6e34cc09 is already in history

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



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