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

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

Change-Id: Ib45fdd517f4e898840ae50d62244006c679369b4