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