[automerger skipped] Merge "Merge "Fix index out of bounds when removing...

[automerger skipped] Merge "Merge "Fix index out of bounds when removing deferred containers" into rvc-dev am: 8da7870b am: c69836c8" into rvc-d1-dev-plus-aosp am: 1cd46453 -s ours

am skip reason: Change-Id I34e02652fb765c1cf78cbd3e86a07e592f02e7df with SHA-1 8a88ca81 is in history

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

Change-Id: I16dcbcea5a154f48f95d4ea63e0a3c61d106b65a