Merge "Revert^2 "Add throtling to crashloop mitigations"" into main am: f8d873df1d am: b4b66f6f92

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

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