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

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

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