[automerger skipped] Merge changes from topic "oom-ams-subreason" into main am: 8b901f01 -s ours

am skip reason: Merged-In I8827995a54e2fb3da3b5c5bd6b9401ef8a5508be with SHA-1 13a32968 is already in history

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



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