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: 7b6380a1 -s ours am: f4871ef9 -s ours am: 849f43ac -s ours am: 8c1cab3b -s ours" into sc-v2-dev-plus-aosp am: 5250b241 -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: Idc81ed2d88602242f5124e53e757b70d77db7f0e