Merge "[sf] fix screenshots when new fe is enabled" into udc-dev am: 401615e0

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



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