Merge "Use a more-specific heuristic to detect mirrored/virtual inset providers" into rvc-dev am: c70711f6cb am: a1328873ec

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

Change-Id: Ic0880aa7a9413e6bc9a79bc3dc665b3c39a7826a