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

[automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9a am: 3d806ea4 -s ours

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

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

Change-Id: I593fc5c93b0206bfe2db526b7e07317d1ab26d7f