[automerger skipped] Merge "Fix index out of bounds when removing deferred containers" into rvc-dev am: 8da7870b am: c69836c8 am: c5be13a0 -s ours am: fa50b9f2 -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: I3d530880c03ba0a881df91de6da7f5eb29a2a4a7