[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into sc-dev am: b9319ef760 -s ours am: 49b1b5e175 -s ours am: 00495e8dcd -s ours am: a6074b72b6 -s ours am: eb31534637 -s ours am: ba1ee78ab7 -s ours am: 8c9be20e56 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20859465 Change-Id: I7abf83dcb952056f32b82135ede750e6664035e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: