Merge "Fix parsing code parcelling errors" into rvc-dev am: 2b220b4ef7

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

Change-Id: Ifba815fef90ebfbac8b871b337baf8f87d1a2d27