Merge "Improve ANR debug store logging with more app lifecycle events" into...

Merge "Improve ANR debug store logging with more app lifecycle events" into main am: 859c5fa3 am: 50f34b45

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



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