[automerger skipped] Merge "Fix parsing code parcelling errors" into rvc-dev am: 2b220b4ef7 am: ea6f7b259e -s ours am: d3869be1ab -s ours
am skip reason: Merged-In I5b33315f8248d5fcbdef2cc04ecf77cc18dbd7b6 with SHA-1 37a0b6de89 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15583462
Change-Id: Id98856757eef2bb1c2e29a0c4b551da1fa051b7a
This commit is contained in: