[automerger skipped] Merge "Fix index out of bounds when removing deferred containers" into rvc-dev am: 8da7870b am: 00de76c3 am: 1d113eee am: a56101f2 -s ours

am skip reason: Change-Id I34e02652fb765c1cf78cbd3e86a07e592f02e7df with SHA-1 110ae76f is in history

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

Change-Id: I2202c700fbf117b79fdc99fe6fad466a7e084225