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

[automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b5 -s ours am: c7186b08 -s ours

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

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

Change-Id: I670d7d76412574430f36c4ec43e772cdc9fdd0bf