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

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

Change-Id: Ied2d4feffb231e55a18633ea4011a79fe1f154cd