[automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b53b -s ours am: c7186b0847 -s ours am: 14e8d1ddfd -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 85b3e879f8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16371979
Change-Id: I0b468d45494bf3fb3a95c6e69cf2ca1da36be9c1
This commit is contained in: