[automerger skipped] Merge "Fix parsing code parcelling errors" into rvc-dev am: 2b220b4ef7 am: 7b6380a147 -s ours am: f4871ef9af -s ours am: 64e34a5593 -s ours am: 13c3b1125b -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: Iefd96db040f22bf8ac358ebe2e4d5c10de2f3e09
This commit is contained in: