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

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



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