[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 -s ours am: e95d8409 -s ours

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

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

Change-Id: Ia90b0eb8b2bab13b8b7d06492beb00673810ac95