[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 am: 1c376943 -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/+/16371979

Change-Id: I3f6fc0a6b5e0b32f5ae1470e2b02e436b5d02e32