Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b53b

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

Change-Id: I04bc0f2026f7780fc27bd3e4c9250edea898673f