[automerger skipped] Merge "[DO NOT MERGE] Handle out-of-bound array index in...

[automerger skipped] Merge "[DO NOT MERGE] Handle out-of-bound array index in FastDataInput" into main am: 743817ce am: 87279f3e -s ours am: 19edd9f7 -s ours am: f867fcbf -s ours am: 6eec5d7f -s ours

am skip reason: subject contains skip directive

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



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