[automerger skipped] [DO NOT MERGE] Revert "Mitigation for mass GC deletion"...

[automerger skipped] [DO NOT MERGE] Revert "Mitigation for mass GC deletion" am: be9bd5da am: 086fe948 -s ours

am skip reason: subject contains skip directive

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



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