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

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

Change-Id: I8e39bc2451f3693c76d0cf5d0368b17618b8727e