Merge "[sf] Update snapshots after screenshots" into udc-dev am: 39fcb504...

Merge "[sf] Update snapshots after screenshots" into udc-dev am: 39fcb504 am: 259e1591 am: c294a3ec am: d12f8a87

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



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