[automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac -s ours am: e95d840923 -s ours am: 02f4d5a8e4 -s ours am: caa7214ae1 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16371343
Change-Id: I4a077b59d55d023e1af326af1444416449f2b64a
This commit is contained in: