Merge "[automerger skipped] Do not modify vector after getting references am:...

Merge "[automerger skipped] Do not modify vector after getting references am: 8cf78f95 am: ffbe7f24 -s ours am: 84340f77 -s ours am: 94360bcd -s ours" into sc-v2-dev-plus-aosp am: dfbfcd21 -s ours

am skip reason: Merged-In I9204b954884e9c83a50babdad5e08a0f6d18ad78 with SHA-1 8cf78f95 is already in history

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

Change-Id: I4734c72187b5c125d29ba18380d2d9eb49ec4e7b