[automerger skipped] Merge "Always process state changes below TOP_THRESHOLD" into main am: 356e0e163a am: 6dc1cf7fb9 -s ours

am skip reason: Merged-In I4884072bd6d7820acee67851d7504886564e2348 with SHA-1 28afbd2a21 is already in history

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

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