Merge "Fix index out of bounds when removing deferred containers" into rvc-dev...

Merge "Fix index out of bounds when removing deferred containers" into rvc-dev am: 8da7870b am: c69836c8

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

Change-Id: I4c3089ed71f6f563f36b96b0115c088249219ca5