[automerger skipped] Merge "Guard against excessively long package names and...

[automerger skipped] Merge "Guard against excessively long package names and certificates." into tm-dev am: 23781f22 am: c05f453d am: a0c8f31f am: 1ac3a48d -s ours

am skip reason: Merged-In I67ae28b6bc896d57abcb45ef586595bd8aa81346 with SHA-1 aaa1cb20 is already in history

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



Change-Id: I64fe1843e1cd4de8ce6b20e816d0c65beb91363e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>