Merge "Nuanced Uri handling related to WM/AM locking." into rvc-dev am: de5b073b05

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

Change-Id: I16d237eb3f1d4c458e2de915da1e3c9eda841515