Merge "Reland "SF: Encapsulate frame targeting"" into udc-qpr-dev am: 695dd0de

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



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