[automerger skipped] Merge "Add the protection to avoid data overflow in...

[automerger skipped] Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java" into sc-dev am: 039660c4 am: 20643002 am: 0b21dd3c am: 56703728 am: 01aac2c5 -s ours am: 7d418779 -s ours am: bb754aeb -s ours

am skip reason: Merged-In I4e3f4881742f0e865eaefabb8ee134c67c6b53d9 with SHA-1 eebe3b8b is already in history

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



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