[automerger skipped] Merge "ActivityManagerService: Allow openContentUri from...

[automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efb -s ours am: 2324f3a7 -s ours am: 4f13d071 -s ours am: 8486a0b6 -s ours am: efcfb1e0 -s ours

am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e4 is already in history

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



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