[automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into rvc-dev am: 2a509c82ba am: 1678956190 -s ours am: 0a5315c6fd -s ours am: 337cd41d3f -s ours am: 6f8c5e373e -s ours am: 5bbfc0fc32 -s ours am: 6f584c5cac -s ours am: 206559a3cc -s ours am: ccb99f14c7 -s ours am: 11c237dfb1 -s ours am: dc598705de -s ours
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22911665
Change-Id: I6f7f81c74e5c77517254984f8a85d6203eaae080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: