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

[automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into rvc-dev am: 2a509c82 am: 16789561 -s ours am: 0a5315c6 -s ours am: 337cd41d -s ours am: 6f8c5e37 -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/+/22911665



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