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

[automerger skipped] Merge "BaseBundle: fix unparcel error logic" into udc-dev am: 87a04e15 am: 6e160225 -s ours

am skip reason: Merged-In Id423936872cbb0e0265ccf2855092357cb175d47 with SHA-1 61ccd0f4 is already in history

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



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