[automerger skipped] Merge "Add ActivityCallerState owners" into main am: 5b42906096 am: e1ae4e5bc2 -s ours

am skip reason: Merged-In Id8637c2305d8c4ce6d1cb2bac745b35763811460 with SHA-1 75cbc169e2 is already in history

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

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