tree cddbf8228814fc404052b99609655e82d31ad951
parent cd7514f9a91734b9d0fac719dfda24322f56fb9e
parent 18effe55378fc801837e1587bcf14b6ff78476c5
author Louis Chang <louischang@google.com> 1672975731 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1672975731 +0000

[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into rvc-dev am: 6790434470 am: 5a38197914 -s ours am: cd7985e8f8 -s ours am: 9426948b40 -s ours am: 97dfc3afdc -s ours am: 18effe5537 -s ours

am skip reason: subject contains skip directive

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

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