[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: 6b9a98b7 am: e950a65b -s ours am: 008d7d3d -s ours

am skip reason: Merged-In Id423936872cbb0e0265ccf2855092357cb175d47 with SHA-1 3adcf170 is already in history

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



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