[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: f0761639fe -s ours am: 0c6699d7e5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20844717 Change-Id: I5272d3e966dbf54cc9239cb81c8c2d9a6b08392b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: