Merge "BaseBundle: fix unparcel error logic" into tm-dev am: 923ad094 am: 6b9a98b7

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



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