Merge "Nuanced Uri handling related to WM/AM locking." into rvc-dev am: de5b073b am: 29575340 am: 597016c4 am: 8e1256f8

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

Change-Id: Id1b696f146c97199a850c43c8daf88d9e0be2dc0