Merge "Revert "Keep ViewCaptureRule logic self-contained."" into udc-dev am:...

Merge "Revert "Keep ViewCaptureRule logic self-contained."" into udc-dev am: 57eaf86f am: fc7e8fa4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23454664



Change-Id: I0da767add8247c3530af0a26e965d6830018ef75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>