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

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



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