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

Merge "[automerger skipped] Merge "Fix parsing code parcelling errors" into rvc-dev am: 2b220b4e am: ea6f7b25 -s ours am: d3869be1 -s ours am: 8dd09894 -s ours" into sc-qpr1-dev-plus-aosp am: 8e161840 -s ours am: 495608f8 -s ours

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

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

Change-Id: I6affe88f7f61f811c980f836f58a193b7bee6156