[automerger skipped] Merge "Prevent IndexOutOfBoundsException while removing...

[automerger skipped] Merge "Prevent IndexOutOfBoundsException while removing activities" into tm-qpr-dev am: c5548851 am: b695b975 -s ours

am skip reason: Merged-In I64955415c04da30d7dc8a4681474ceb06db1e88b with SHA-1 26a92f5d is already in history

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



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