Merge "Fix index out of bounds when removing deferred containers" into rvc-dev am: 8da7870ba5 am: 00de76c3f1

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

Change-Id: I06e92195ccbaf7cbb2633899dfe54af94c7252b6