[automerger skipped] Merge "Fix parsing code parcelling errors" into rvc-dev...

[automerger skipped] Merge "Fix parsing code parcelling errors" into rvc-dev am: 2b220b4e am: 7b6380a1 -s ours am: f4871ef9 -s ours

am skip reason: Merged-In I5b33315f8248d5fcbdef2cc04ecf77cc18dbd7b6 with SHA-1 f93af7ef is already in history

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

Change-Id: Ib090dcab43695586aa627260c2052c5dc95075a8