[automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours am: a4b42b8624 -s ours am: 5949a0414c -s ours am: 94f7203de4 -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/+/22915959
Change-Id: I1722edae56e28ed4bf21d963d4968653b094c322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: