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

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



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