[automerger skipped] Merge "Add missing size check when parsing staged...

[automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-v2-dev am: 067e59bb am: 5b0a1261 -s ours

am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 a27822a7 is already in history

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

Change-Id: I60270ffba2aed855e9190cce8a546dfe001af9bc