Merge "BaseBundle: fix unparcel error logic" into udc-dev am: 87a04e15 am: 5dd28f5e

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



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