Merge "Reland "SF: Encapsulate frame targeting"" into udc-qpr-dev am: 695dd0de28 am: 65fc8649f1

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

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