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

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

Change-Id: I32c83d1cdc098b2146a034a1cf26c3fcfdfe1bee