Merge "Prevent IndexOutOfBoundsException while removing activities" into tm-qpr-dev am: c5548851

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



Change-Id: I23136fdcad2ff0fde6e01ac615153126f1daed65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>